gdm: don't clear user-verifier on reset automatically

Right, the common code between the login screen and
the unlock screen handles clearing the user verifier
when GDM sends a reset.

We don't actually always want to clear the messages on
reset in the unlock case, though, so doing it implicitly
is problematic.

This commit moves the clear() call from the common code
to the specific reset handlers.

https://bugzilla.gnome.org/show_bug.cgi?id=694688

diff --git a/js/gdm/loginDialog.js b/js/gdm/loginDialog.js
index 373ddb5c67739161ab659f578589ad137e54e3ff..0abd233cdcc9b61d46ba433a676c0c1109b373fa 100644 (file)
--- a/js/gdm/loginDialog.js
+++ b/js/gdm/loginDialog.js
@@ -691,6 +691,8 @@ const LoginDialog = new Lang.Class({
     },
 
     _reset: function() {
+        this._userVerifier.clear();
+
         this._updateSensitivity(true);
         this._promptMessage.hide();
         this._user = null;

diff --git a/js/gdm/util.js b/js/gdm/util.js
index 6b69f33ee51a45862160381a5f03e7610bfb0f7a..4de22e416fcde48df6ce4ecd0801d8b21424f31d 100644 (file)
--- a/js/gdm/util.js
+++ b/js/gdm/util.js
@@ -346,8 +346,6 @@ const ShellUserVerifier = new Lang.Class({
     },
 
     _onReset: function() {
-        this.clear();
-
         // Clear previous attempts to authenticate
         this._failCounter = 0;
 

diff --git a/js/ui/unlockDialog.js b/js/ui/unlockDialog.js
index 29825323eaca911acf62e57d140ef0414c65559b..70452a8de1c03c002c2144dc22a20cc05fcd59b4 100644 (file)
--- a/js/ui/unlockDialog.js
+++ b/js/ui/unlockDialog.js
@@ -255,6 +255,7 @@ const UnlockDialog = new Lang.Class({
     },
 
     _onReset: function() {
+        this._userVerifier.clear();
         this.emit('failed');
     },